Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for mallocx alignment behaviour. #19

Merged
merged 6 commits into from
Jan 15, 2024
Merged

Check for mallocx alignment behaviour. #19

merged 6 commits into from
Jan 15, 2024

Conversation

jacobbramley
Copy link
Collaborator

@jacobbramley jacobbramley commented Dec 8, 2023 •
edited
Loading

CheriBSD's revocation support is incompatible with MALLOCX_ALIGN and MALLOCX_ARENA, so disable it in tests, and also add assertions to ContinuousArenaMalloc to ensure that we're actually getting aligned capabilities in the expected memory region.

This PR also adds CapableVMs merge queues support.

@ltratt ltratt self-assigned this Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2023
@ltratt ltratt added this pull request to the merge queue Dec 8, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2023
@0152la 0152la added this pull request to the merge queue Dec 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 11, 2023
@0152la 0152la added this pull request to the merge queue Dec 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 11, 2023
@0152la 0152la added this pull request to the merge queue Dec 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 11, 2023
@0152la 0152la added this pull request to the merge queue Dec 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 11, 2023
@0152la 0152la added this pull request to the merge queue Dec 11, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Dec 11, 2023
@ltratt ltratt added this pull request to the merge queue Dec 12, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Dec 12, 2023
@jacobbramley
Copy link
Collaborator Author

Locally, I still see a failure (due to the new cheri_is_aligned(result, size) check) on 3d-morph under tier1asm, but several others now pass. This probably isn't the last patch, but it's perhaps worth seeing what the CI makes of it.

@0152la
Copy link

0152la commented Dec 18, 2023

For reference once we come back from the holidays, I've started another CI run to see how it goes [1].

[1] https://bencher14.soft-dev.org/#/builders/2/builds/142

@jacobbramley jacobbramley changed the title CapableVMs: Migrate to merge queues. Check for mallocx alignment behaviour. Jan 12, 2024
@jacobbramley
Copy link
Collaborator Author

Ok, 21b3c79 passes ./.buildbot.sh when I run it locally, so this should be good. It did take four and a half hours to go through every test variant, so might still time out, but the other issues should be gone.

@ltratt
Copy link

ltratt commented Jan 12, 2024

Please squash.

@jacobbramley
CapableVMs: Drop 'cloop' run from buildbot.
ab2797e 
This is, hopefully, a temporary measure to allow the run to complete
before the Merge Queues timeout.
@jacobbramley
Morello: Check for mallocx alignment bug.
8ac2632 
CTSRD-CHERI/cheribsd#1964

This was fixed, but the assertions here might be useful in case someone
tries to run this on an affected CheriBSD.
@jacobbramley
Morello: Check for mallocx arena bug.
d64b974 
CTSRD-CHERI/cheribsd#1969
@jacobbramley
CapableVMs: Disable revocation to unblock CI.
4dfce0a
@jacobbramley
Morello: Specify ContinuousArenaMalloc realloc alignment.
0cf8f85 
This is mostly for symmetry with alignment (malloc), making it easier to
verify that we're not breaking existing alignment constraints.
@jacobbramley
Copy link
Collaborator Author

Please squash.

Done, but the CI says "skipped" so I'm not sure if it worked or not.

@ltratt
Copy link

ltratt commented Jan 15, 2024

Ah, yes, "Skipped" is a bit weird :) We do that to "skip" the CI run that GitHub would like to run when a PR is raised/altered -- we only want to run CI when we press "merge".

@ltratt ltratt added this pull request to the merge queue Jan 15, 2024
Merged via the queue into capablevms:main with commit 68c61cc Jan 15, 2024
2 checks passed
@jacobbramley jacobbramley deleted the cvms/merge-queues branch January 16, 2024 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ltratt ltratt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jacobbramley @0152la @ltratt